make servlet3 + spring webmvc + jaxrs 2.0 indy compatible #12432
Conversation
SylvainJuge
changed the title
...telemetry/javaagent/instrumentation/springweb/v3_1/WebApplicationContextInstrumentation.java
Outdated
Show resolved
Hide resolved
…nstrumentation into indy-servlet3
…nstrumentation into indy-servlet3
…nstrumentation into indy-servlet3
| } | ||
| Object bean = springCtx.getBean("otelAutoDispatcherFilter"); | ||
| OpenTelemetryHandlerMappingFilter filter; | ||
| if (bean instanceof OpenTelemetryHandlerMappingFilter) { |
There was a problem hiding this comment.
[for reviewer] this is an edge-case where the inlined advice will be able to directly call the OpenTelemetryHandlerMappingFilter class directly and with indy we get a proxy instance that needs to be unwrapped (thus the delegate fields needs to be made public for simplicity).
There was a problem hiding this comment.
I'd suggest to add a TODO here to drop this branch when we remove support for inlined advice then maybe?
|
|
||
| Object bean = springCtx.getBean("otelAutoDispatcherFilter"); | ||
| OpenTelemetryHandlerMappingFilter filter; | ||
| if (bean instanceof OpenTelemetryHandlerMappingFilter) { |
There was a problem hiding this comment.
[for reviewer] this is an edge-case where the inlined advice will be able to directly call the OpenTelemetryHandlerMappingFilter class directly and with indy we get a proxy instance that needs to be unwrapped (thus the delegate fields needs to be made public for simplicity).
SylvainJuge
changed the title
…nstrumentation into indy-servlet3
| } | ||
| Object bean = springCtx.getBean("otelAutoDispatcherFilter"); | ||
| OpenTelemetryHandlerMappingFilter filter; | ||
| if (bean instanceof OpenTelemetryHandlerMappingFilter) { |
There was a problem hiding this comment.
I'd suggest to add a TODO here to drop this branch when we remove support for inlined advice then maybe?
...main/java/io/opentelemetry/javaagent/instrumentation/grails/GrailsInstrumentationModule.java
Outdated
Show resolved
Hide resolved
…nstrumentation into indy-servlet3
…nstrumentation into indy-servlet3
...o/opentelemetry/javaagent/instrumentation/springweb/v3_1/SpringWebInstrumentationModule.java
Show resolved
Hide resolved
| if (bean instanceof OpenTelemetryHandlerMappingFilter) { | ||
| // inline advice: no proxy class is used | ||
| filter = (OpenTelemetryHandlerMappingFilter) bean; | ||
| } else { |
There was a problem hiding this comment.
Imo instead of doing the reflection here there should be an API to do this. Something that would unwrap the object when it is proxy and return the input when it is not. So you could write OpenTelemetryHandlerMappingFilter filter = = (OpenTelemetryHandlerMappingFilter) unwrap(springCtx.getBean("otelAutoDispatcherFilter"));
I guess using the reflection as currently is fine for start. Instead of making the delegate field public I'd probably try to make the proxy instance implement an interface that allow unwrapping. If needed that interface could be hidden from reflection
…nstrumentation into indy-servlet3
…nstrumentation into indy-servlet3
part of #11457